random cleanup + comments