* commenting cleanup