Revert "[#7] New clean style"

This reverts commit 1df63b9a7eee94c86932c5c2c59be4a25bf592c6.