Damn you xtend refactoring