Fixed/Cleaned up code
Created Window Class which handles all of the window create
removed window creation from main method