Stylistic Changes

Changes to indentation and  improvements on readability