Cleaned up library to push to Hackage.