Code cleanup

o Cleaned up high prio findbugs warnings.
o Removed unneccessary modifiers from fields and interfaces, reported by PMD.