PEP8 for entity.py as well