clean up some constants