Organized keywords by name, changed pdef to const