Some minor Refactorings