Few minor beautifications