[TASK] Minor code fixes

mostly cosmetical