Changed to private where possible