functions broken out with names
separated to MVC
Merge pull request #1 from gpavey/rename_functions

Rename functions