renamed some struct fields
renamed some struct fields
removed declarator struct