Cleanup and some methods in AtmoWinHandler added