Did some Refactoring work