commenting cleanup