- renamed functions and make private