cleaned up model & routes