some linting and cleanup