cleaned up some more code, considering sticking in backbone