Updated JSHint options; updated code for consistent formatting