Made some code clean-up and some renamed class, views, and model related files