cleanup comments. better readable