lots of refactoring on small things