Renamed some methods for improved readability