Code cleaned-up.