Cleanup up only, no logic changes. Beautify, jslint