JSCS / JSBeautify and minor cleanup