Formatting & JSHint pass