Simplify some code in dimension.
Make things fit in 80 columns.
Merge pull request #295 from abellgithub/dimension

Simplify some code in dimension.