// small improvements