minor modification (unneccesary spans removed)