more comment cleaning