Changed .gitignore (PMD-files are ignored)
Some refactoring in response to PMD warnings