More changes in the style.
Merge pull request #23 from puneet/constraints-dev

More changes in the style.