ticket:3 Structure changed. double check PEP8