some more beautifying. grrrr