Format code
Merge branch 'clean-up'