Files to be reviewed

Magic numbers. Consider replacing with configured values.