Some Formating of files and using objects at arguments instead of hashes in the client