Refactoring the first section