corrections after phpmd and phpcs