Cleaning up some verbage