Pythonic/style updates