cleanup variables used for readability