General maintenance

Using now pointers to structures as int type