Made more stuff private