Before code cleanup
before rel revisit
ostry refactor
after refactor