Cleaned up mess.