clean up to reduce phpmd and phpcs errors