Tidy up the style throughout
Add unit test for extraction of gzip files