More code cleaning on initial activity.