Cleaned up the new code.