fixup! [TASK] Code cleanup