I also thought abt that initially. Then thought there may be lot changes needed in other areas also..  Let me see with this. This looks cleaner