More gas giants, more refactoring