Cleaned up selectors, simplified DOM