Revert "Refactoring! --> Bug Fixes"

This reverts commit 35214a30d597e2dd5567ba612e5d5ba5d7d459de.