Renamed some methods for better readability