Fixup storage hooks, realign for pep8