Some styling cleanup