restyle
final fixes