Refactor (to simplify code) based on review.

- Also use "public" attribute for accessing storage.