Improving macro