Minor code beautification