Fixed inconsistency.
Typo.
Some cleanup
For ease of viewing.