Structural refactoring and more answers