Refactoring, style fixes
7 files changed