made some readablity changes