Refactor begun - better angular practices/ui-router