Updating code based on Review board recommendataions