Some more Refactoring