Cleaned up constructor method