Work on build
Formatting