Various Refactorings