some beautifications (hopefully)