Adhere to PMD rules
Switch to bug fix in dinistiq 0.3-SNAPSHOT