code cleanup
structs modified