pep8 compliance
refactoring data storage