Added formatting as per pull request comments