Python3 support
cleanup / better code