Minor syntax tidying up.
Added tree structure.