Internal changes, cleanup