[INTERNAL] code cleanup