:chestnut: lint fixes