Cleaned up the use of Final in the window class