Made everything that needed to be private private