Some Small Refactorings