Shortening/renaming of functions and re-indentation.