Minor code beautificaiton