Remove ugly helper function mess