refactoring windows -> scene & heavy linting!