nitpick improvements, yay