cleaned up some of the language and functionality