Moved some stuff out of Sentence which shouldn't be there