Formatting changes.
Reorganized Reader.hs.