Made it better encapsulated.