More separation into helper functions