fix chevrons and small cleanup