Make datastore.entity PEP8 and pylint compliant