More code cleanup
2 files changed