LPS-51882 Make all the auxiliary methods protected and ant format-source