Remove universal selector and clean up spacing