fixed private/public functions and properties