quick refactor to gain better reuse and more obvious designation variable names