Minor beautifying