Made code less hideous