Conform to pep8
Line-level cleanup: naming, unused variable, compact tests
Func-level cleanup: break up store_data method
Merge pull request #3 from akiraak/feature/save-data-review

Review: feature/save-data