Change some public into private