changes made for phpcs errors and warnings