Minor cleanup
Strip file paths