Little refactoring being done