Revert "Overall code afte"

This reverts commit a2f3ca3cccd50305bfcf200c9e7f01771f6f63d9.