Misc. formatting / orgainzation updates.