#45: Small Refactoring