Code cleanup and caching values
Merge branch 'master' of https://github.com/lazd/Satellite