cleanup private header file, make functions static