some more beautifying