function names polish
some polishing