first batch of review changes: code-style