small cleaning up

Time: 233 ms, Memory: 21.00Mb
OK (256 tests, 258 assertions)

Change-Id: Ifbbf8819a83802f6b73574c93f4b4fe47bc4f44d