Clean up and restyle
Clean up and restyle