Cleaned up storage service a bit.