Respond to review comments

- Removes blank lines
- Introduces Border type, to wrap the string style