Made functions non-private