Added Store functionality and partial PEP8 conformity