Code cleaned up.