tweak styling and clean up structuring