continue motel refactoring/fixes
continue code refactoring / cleanup - many changes to users module and specs