Code less (18/22)

Code less