repo public state - refactoring - part 1