Minor changes made according to jshint.com