update and re-style