[INTERNAL] Some code cosmetics.