Refactor style into less variables for #584
Merge pull request #607 from GotenXiao/less-variables

Refactor style into less variables for #584