undo even more aesthetic refactoring