PEP8 and normalized worm changes