Refinement

Refinement of method headings, tests , etc.