More refactoring , still not added anything new