Code beautify

Make the code look more like meta-programming
But still cannot handle multiple variable