Fixed comment @see link
Formatting
Removed redundant code
Fail filename prettifying more gracefully