Add review comments

- Clarify import ordering
- Remove rule about aligning tokens