Making the code less W.E.T.