Refactors needed accroding to PHPDepend