Changed some things to private and default.