Made everything private and did some cleanup.