Refactoring: moved from compound to americano