some minor prettification work