Code review clean up.