Commit after kmmbvnr comments about code