Initial cleanups recommended by jslint