Revert "Revert "cleaning the codez for #25""

This reverts commit b139d614eaa4978be0c1080b5b669cab57374996.