Formatting
Refactor