[uniform] style: cleaner structure