[TASK] minor coding style optimizations