minor fix class to struct