clean up selectors and basic formatting