Refactor/Formatting