Source code cleaup (Phase 1)