Cleaned up stuff, hopefully.