Minor beautification