Slight Refactoring