feat:improved overall, clean style