Cleaned up some comments and things