Updated to JSHint standards