More py3 style compliance, more use of builtins