Formatting and JSHint fixes