Name refactoring
Formatting