Code review, clean up.