Cleanup comments, formatting, etc