Code style updates and markup changes