Code Review: Manual re-alignment.