Updates based on @tarruda and @justinmk comments