Optimmize the Syntax data types a bit