Make more stuff private