reworked, beauty code