Runner file added
Code tidied up