Minor cleanups
Merge pull request #21 from bioinformed/htslib-refactoring

Thanks