some clean-up for readability, this needs to get done