Changing decision flow in parse to be more readable