cleanup+restyle