[TASK] Cleanups according to code style inspections