reorganize to have only one variable for debug kit

other phpcs fixes too