refactor, remove some duplicate lines.
Merge branch 'patch-2' of https://github.com/bruslim/satellizer into bruslim-patch-2
refactoring: remove code duplication