Minor code beautification
Nice speed improvement