First draft
Cleanup and formatting tweaks