Formatting and method renaming