Cleaning up Window factory