No need to clean the path
Fix formatting
Remove todo