Changing methods to public to allow for testability