Changed: Code clean-up using PhpStorm's code inspection.