Improved strategy in analytic surface calculation for molecular systems: Handling of singularities and computational efficiency | Synapse