Lint updates and small fixes to simulator and treeCl