cleanup + comments