Follow lint suggestions