a little bit of code cleanup
more code fixes for fattree