Updated comments on Window and Main class