cleaning up and adding new helpers