Moving normalization next to CLI