Code smart (25/26)

Code smart