cleaned up some code and removed partials