Better cleanup + typo fixed