Code cleaned up & revisited.