cleaning up the modularization a little bit