Sprint zero cleanup development

General cleanup of models and controllers