cleanup + comment