Remove extra spaces, add comments