Small improvements in formatting and naming convention.