cleaned up command package