merciless refactoring (not really)