reformat code
add alias annotation and its utilities