Moved viewport/clear to window
Cleaned up Window