clean up constants a little bit.