cleaned up the comments & descriptions a bit