refactor aliases and some comments