Mostly esthetic changes

* Move my added functions to where other utility functions are in the file
* Remove some white spaced
* Remove separate case for sevenzip_wrapper from a few functions