PEP8 adherance done :) This was a big cleanup operation.