Variouos Refactoring