Cleaned main frame class