super clean rewrite