some more pmd fixing(avoid using to long variable names Erik :) )