Some More Refactoring