small code beautyness changes