Refactoring in DefaultAnswer (rename fields and indentation)