Removed redundant calls.
Removed complexity
Moved dealer construction to screen manager.