modulize little bit