Revert "Cleaned up some code."

This reverts commit 1dd2f90a25c623312a05712bdde12508f9cbce8b.