Some More refactoring