Refactoring
Formatting