Use $HOME as the source instead of basename.

Plus some whitespace cleanup.