Tidy up and add cron run