Revert "Code adjustments"

This reverts commit 637f2b2becc256f5205fb3d76f4a1bb2a5195b86.