Refactored sections to classes