Fixing stuff to be in line with python style