Cleaned up window location