Refine the script

1. use better descriptive column name
2. simplify the script