Some cleaning + Suite -> Runner