Made minor fixes as per discussion