Started to make EyeWitness PEP-8 compatible