Fix lint complaining.
Start refactor
Add runner
Update for ghc 7.8