Make that stupid assert not lock.locked() error go away
Shut up some pylint errors, whitespace fixes