Style changes based on @carpeliam's feedback