some minor beautifications