Cleanup aliases
Start using ADT
An well known tip