Revert commit 837713db08
Revert commit 702519e84
Alter code style