Formatting and minor name refactoring