Fixed up the space rules