[Observe-commits] 35/38: clean code