[chore] More lint fixes and formatting

@donnapep @stulees please review. Thanks.