cleared phpcs and phpcpd problems + cleanup