Another round of generic code improvements ; hints provided by Netbeans/plugins
Merge pull request #38 from dizzzz/feature/cleanup_code

Another round of generic code improvements ;