Tidied Maya.hs