changed some language and removed unnecessary code