Split examples for clarity, comments and minor improvements