Code less (20/22)

Code less