Added more consistent styling