[CDE-162] Improving solution