linting & switched to o.enhanced