cleanup / linting