Cleaned up file paths