refactor controls, removed console.logs