Return instead of echo
File download response header improvements

* Cleanup some code
* Return to inline for Content-Disposition