PEP8
merge lots