a bit of refactoring
more refactoring
more refactoring
more refactoring
more stuff