minor cleanup + comments