Simplified the constructor