Fixed double forward slashes
Refactorings