Revert "#9 and cleaning"

This reverts commit e267615c9741cc903ba0148f53d7fcc4af6dac35.