Removed unnecessary headers and split main into a window and a program