cleanup of header, renamed functions that didn't follow the lowercase_underscore_name_syntax()