Removed if & else conditions on lines 387 -> 391  which were leading to the same statement whether the condition was true or not.