Formatting cleanup
Added weave support.