reformatted; refined declarations