Default's to file server's home directory instead of defaulting to hardcoded /tmp
Fixes whitespace
Refactor callback handler