cleaning up helper structure package