Refactoring: Fix JSHint errors