Work on build and format