cleaned up Control and Display classes
cleaned up some statics