Cleaned up some comments and left-overs