Style changes, figuring out what goes where.
I'm not using NetBeans, as the rest of you, as far as I know. So I've taken out most of the stuff that's not Java...