Renamed some functions shorter