remove superfluous debugging console.log
simplify callbacks model