Change long aliases to functions and add comments