Comments clean up, consistent formatting