lint related cleanup