Revert "cleaning the codez for #25"

This reverts commit 0ae5f9ebc9d8cf6e4d7500e1273f499871671f9f.