Revert "Updates to the code"

This reverts commit 5e17a59b138013c7318ccdb9f92a490db0951cda.