Cleaned and simplified the Desktop Class