refactored some paths