Updated comments, cleaned up formatting