cleanup and better npm scripts