Clean up spacing/comments