lint fixes & optimizations