Code clean-up to get a jshint free of warnings version