Revert "code inspection"

This reverts commit ad37406553e6576c87fb6088e630a176ffeef29f.
Revert "final changes"

This reverts commit 76873e41de971c3b010b6f215eebff0b7e06a8a2.