Always build first when watching
Minor reformatting