JSHint Options++
Minor Refactoring