tidied up includes and parameters