Added type annotations, moved functions to Utilities.hs