Cleanup various aspects of code, fix some formatting, more netbeans 7.4 stuff