2x oops and made jslint pass