Cleanup before addressing reviews
Easy comments by reviewers addressed
iter