Cleaned up; Added haskellmode