linting & clean up