Little improvements can be done

Mod edit: Retimed to 17:22 following the new rules.