some more beautifying. almost