Retaining Some Sanity

Cleaned up the last commit a little.