cleanup. comments