Propagation Characteristics of Single-mode Step Index Linear and Non-linear Optical Fiber involving Improved Lorentzian Approximation for the Fundamental Mode