Refactor
Refactor/create window