Clean styles and use nesting