variable name unification between functions
added some doxygen-style comments