updates on the style and clean-up