improve dot code readability/dryness