Micro reorganization in the main class