Simplified constructor code