Feature/pmd findbugs cleanup part1