Some code cleanup
34 files changed