Moved some of the public properties and functions to be private as they aren't needed or used outside the code itself.