integrate aliases and clean up comments