code cleanup as suggested by phpcs