Make some code less stupid