cleanup & jslint