simplify, shorten some function names