Improve aesthetic