Misc cleanup and linting