Clean up following JSHint suggestions