Lint suggested cleanup