Code smart (15/26)

Code smart