[TASK] Codestyle improvements