Cleaning up some of the definitions