further refactoring of sections