Step-11 : CSS cleanup and final DRY up