Cleaning up; added window class filtering