lint and style fixes