Revert "Some Refactoring"

This reverts commit ed863af4442aba728c3bcaa6ce2ff2b9ffe101c4.