Refactored models and services for later use
Adds comments
Updates capitalization