De-linting, general cleanup