Clean up code, pass 'gulp lint'