Vivek | Optimisation by reducing less function calls