Making a few class internal