minor tweaks and beautifications