Made switch blocks nicer