Remove superfluous lines
PEP8 style fixes