start changing to 4 spaces. clean up a bunch of storage code.