actions

cleanup, if statement format change, organization