Made code less stupid