Extracted Constructor/2
Minor cleanup