misc cleanup from netbeans inspect & transform