Linting & reducing complexity