Clean up
Fix path