clean up the model with better comments and a list comprehenshion
clean up comments, remove unneeded parens
fix tests, these methods expect strings not ints