Make code more pep 8