Rewrite to prettier dev