fixed styling and whitespacing