Non functional changes requested by Marco.