Cosmetic changes
Major code reorganization