Make code less psuedo