Fix issue with small trees, also C-fy notation more