readabiliy cleanup