Fix pep8 warnings

@gtrogers
@pbadenski