This is not a mockup, now
Fix jslint errors