Renaming methods and fixing formatting