[#2894] Lint fixes & cleanup