Small screen code cleanup.