AW: Some refactoring proposals