Minor Reactoring Of Code