Simplified constructor, updated documentation