cleanup aliases and tweaked prompt