Refactored zenith angle and satellite checks to methods, minor cleanup