[org] Code cleanup.