Stylistic Changes

Changes to indentation and readability