wrap each selection text in a span for better vertical centering

- also clean up inconsistent coding style