tidy up css usages, case #39