fix, improve, format