Improve entry styles