HLint suggestions.
Move more things to Reader.
Little restructuralization.