Cleanup on some of the comments
merger branches