Revert "minor changes"

This reverts commit dcda27c2a429d8b24e5433244d19b2b8ea735936.
Reverted back because of runtime errors