cleanup + comments for next steps