dictionary model refactoring
cleanup