Performance tweaks per lint
More lint fixes