Small Refactoring Of Code