Easier path building
No last line
Lint white-space fixes.