structure and styling fixes
minor style updates
minor style updates