F1: Make code refactoring.

Refactored Desktop.