Applied standard auto-formatting to changes from PR #153