issue #34 fixed and small cleaning