Clarified assignment based on notes from Spring.
Formatting.
Light cleanup.