* lots of lint cleanup