additional styling and fix failing tests