cleaning aliases a bit