Made some plugins more Pythonic