Finally achieve build output that seems tidy