Cleaning up methods for easier readability