Code cleaned some