Private-ized a few methods. Clean-ups.