The code has been cleaned up.