Cleaned up with hlint.