clean up on charts and style