Cleaned up some of the comments