Increase readability: decrease complexity of the build function and preserve wandering off too much against 80-char "buoy"