refactoring 2: electric bugaloo