readability & consistency adjustments