Code cleanup per jsHint