minor tidy and modify
mcg