Simplified main and deleted Display