Refactor of kit_presenter