Changes that I would like to throw away
Revert "Changes that I would like to throw away"

This reverts commit 948b2be0dbdf49d98d2f298c85843e1f571457d5.
cleaned up the code