- Findbugs/PMD Issues corrected
- warnings removed