fixed indentation and more consistent styling