clean up spacing
initialize protocol enumerators and clean up spacing/names