Made more things internal.