JSHint and unused var changes