Clean up formatting during build