[TASK] Cleanups according to code inspections