Minor code beautify