Small style changes, as requested.