Minor Refactoring

Nothing much