Remove a bit of extra whitespace.
Rename *-path vars to just * and made sure they return File objects.