Clean up screen code