[TASK] Improve code quality