cleanup

some function headers reviewed