cleanup + adding comments to address