Finished converting all public properties to private fields