Simplify further (just count wood) + clean unnecessary cruft