Slight idomatic python cleanup