Simplified the CREATE TABLE and CREATE INDEX builder

Simplified the CREATE TABLE and CREATE INDEX builder #86