some small changes for uniformity