Some code cleaning and phpmd improving (nothing messy remaining )