minor refactoring
some linting and cleaning