general tidy up
Merge pull request #95 from BBC-News/code_cleanup

general tidy up