Did some refactorization. and modified the plugin to follow some more java rules and cleaned the code up a bit.