Adding a bit mroe cleanup comments