Address review comments

- Given -> And
- Align a string