optimizing, styling a bit