some prettifying and exercise ordering
Merge pull request #6 from lauyeung/minor-form-tweaks

some prettifying and exercise ordering