more cleanup and styles adjustments