[#26] Little code clean up.