Cleaning up models, collections, naming schemes
Added in a TODO reminder