Improve the stracture