Minor refactor: Slight reordering of methods and added comments for grouping