Clean up Public Variables

Made some variables private, removed others.