storage: some style refactoring