cleaning in aliases and functions