Window|Refactor: Cleaned up Window construction