more lint related cleanup