Cleanup, jslint fixes