rename header file
improve function visibility