Move helper methods to fun