comments and refactoring
whoopsy