clean up command to make it splittable; change class param to module, class might be used later