changes from review feedback :)
also linted on jshint