Minor refactoring and linting