Clean code

Change all where Just z = x to z = fromJust x