Format code
Refactor