improve code from RB comments
Finished feature 55150784/test2-sfdsfdsf-sgsdgfdg.