Updated comments, cleaned up spacing