Whitespace changes
Refactor package saving and updating to pass tests and centralize code