reorder methods for clarity & clean up comments after refactoring