Add editor folds to clean up main class