Renamed some methods, created constants