light refactoring... not borken