Streamlines macro generator a bit more