tidying + making better use of modules