Readability - separate add class to new window