tidy up
Merge pull request #4 from DannyShort/Working-On

tidy up