Incorporate feedback from JSHint