Fix review comments

Includes some style changes and translation updates.