Krunal optimized

Few changes in code