[Observe-commits] 24/26: clean code