Minor improvement to the code (bonus).