Cleaned up and combined angular to app.js