Sonme Refactoring