more cleanup

fnselfactions clean up and restructure