hlint fixed. Only code duplication remains.