Cleaning common.c