Merge pull request #916 from thongsav-usgs/CCHS-19

Small fixes + refactor
Fixed pom issues