Refactored to fix slash duplication