Add aliases
clean up code a bit.