redo type declarations, assignments