Self review + linting fix