Reorganizes some methods for improved readability