diff --git a/python/lammps/core.py b/python/lammps/core.py
index 2e57e3d985..1995349890 100644
--- a/python/lammps/core.py
+++ b/python/lammps/core.py
@@ -87,9 +87,9 @@ class command_wrapper:
         args = list(args)
         args[0] = lammps(ptr=args[0])
         x(*args)
-        setattr(__main__, func_name, handler)
-        return func_name
-      return x
+      setattr(__main__, func_name, handler)
+      return func_name
+    return x
 
   def __getattr__(self, name):
     """
@@ -112,7 +112,7 @@ class command_wrapper:
       # Python 3.6+ maintains ordering of kwarg keys
       for kw, arg in kwargs.items():
         cmd_args.append(kw)
-        if isinstance(arg,bool):
+        if isinstance(arg, bool):
           cmd_args.append("true" if arg else "false")
         else:
           cmd_args.append(str(self._wrap_args(arg)))
diff --git a/unittest/python/python-cmdwrapper.py b/unittest/python/python-cmdwrapper.py
index 50d2092e95..4a7b0b7ada 100644
--- a/unittest/python/python-cmdwrapper.py
+++ b/unittest/python/python-cmdwrapper.py
@@ -53,7 +53,7 @@ class PythonCmdWrapper(unittest.TestCase):
 
         types = [1, 1]
 
-        self.assertEqual(self.lmp.create_atoms(2, id=None, type=types, x=x), 2)
+        self.assertEqual(self.lmp.create_atoms(2, atomid=None, atype=types, x=x), 2)
         self.assertEqual(self.lmp.extract_global("natoms"), 2)
         pos = self.lmp.numpy.extract_atom("x")
         self.assertEqual(pos.shape[0], 2)