Change to a more consistent alignment style.
Update line breaks to a more consistent style.
Add specs.