Cleaned up a bunch of code. No real additions