Cleaning up some recursion/formatting
less debug