refactor datamapper model mutators, cleanup