Post latte refactor