modularizing && pruning