PLA-111 improve code quality