Cleaned up Xtend code.