changed some functions to macros, since they only contain one line of
code.