Simpler better (24/27)

Simpler better