Refactor
Formatting