Minor code formatting, docblock tweaks
Use translations where possible