made fixes as per review comments