Make some parts more readable
Move things around in Generator