modularizing

separating