Making improvement as per suggestion