Stephen - moved a few things around to cut down on warnings from netbeans