und castellano exercise hints refactoring in progress