Series of minor clean-ups for aeolus-image