Added private / public where applicable.