Move focus logic into correct controllers tidying up app.js