clean up the constants a little