Fix issue with path expansion
Formatting fix