Revert "Clean and coding standard"

This reverts commit 598274bd979c60d11dbc5c706a69c78185dfe813.
Revert "Clean (coding standard)"

This reverts commit bfd959d4565cda2cdfa9049627f91c6342a2cfab.